From e35fdd2271f775198e33a2635d62a1c2faa5669f Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 27 Aug 2012 16:47:58 +0000 Subject: [PATCH] mysqlcppconn-libmysqlclient-SONAME Gbp-Pq: Name mysqlcppconn-libmysqlclient-SONAME.diff --- mysqlcppconn/mysql-connector-c++-1.1.0.patch | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/mysqlcppconn/mysql-connector-c++-1.1.0.patch b/mysqlcppconn/mysql-connector-c++-1.1.0.patch index 9d9a8ad7c60..b1356693765 100644 --- a/mysqlcppconn/mysql-connector-c++-1.1.0.patch +++ b/mysqlcppconn/mysql-connector-c++-1.1.0.patch @@ -114,7 +114,7 @@ NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {} --- misc/mysql-connector-c++-1.1.0/driver/makefile.mk 2009-09-11 09:42:34.087202551 +0200 +++ misc/build/mysql-connector-c++-1.1.0/driver/makefile.mk 2009-09-11 09:42:25.902286382 +0200 -@@ -1 +1,64 @@ +@@ -1 +1,66 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -167,6 +167,8 @@ + $(LIB1TARGET) +DEFLIB1NAME=$(TARGET) + ++CFLAGS += -DLIBMYSQLCLIENT_SONAME=\"$(shell readlink -f `mysql_config --variable=pkglibdir`/libmysqlclient_r.so | sed -e s/mysqlclient/mysqlclient_r/ | sed -e "s,`mysql_config --variable=pkglibdir`/\(libmysqlclient_r.so.[0-9][0-9]\).*,\\1,")\" ++ +# --- Targets ------------------------------------------------------ + +.INCLUDE : target.mk @@ -235,3 +237,15 @@ + +# --- Targets ------------------------------------------------------ +.INCLUDE : target.mk +diff -urNad mysql-connector-c++-1.0.6~r754~/driver/nativeapi/libmysql_dynamic_proxy.cpp mysql-connector-c++-1.0.6~r754/driver/nativeapi/libmysql_dynamic_proxy.cpp +--- misc/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 16:42:14.000000000 +0200 ++++ misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 20:25:31.000000000 +0200 +@@ -26,7 +26,7 @@ + #elif defined(__APPLE__) + static const char * const baseName = "libmysqlclient_r.dylib"; + #else +-static const char * const baseName = "libmysqlclient_r.so"; ++static const char * const baseName = LIBMYSQLCLIENT_SONAME; + #endif + + template -- 2.30.2